From: Gert Wollny <gw.fossdev@gmail.com>
Date: Sat, 4 Mar 2017 11:50:47 +0000 (+0000)
Subject: merge new upstream and resolve according conflicts
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~248
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=85ee37363d9be09c3d550f8763a5d2879b916b2e;p=dcmtk.git

merge new upstream and resolve according conflicts
---

85ee37363d9be09c3d550f8763a5d2879b916b2e
diff --cc dcmnet/libsrc/dstorscu.cc
index c93f1756,4cd7acf6..a8863fb1
--- a/dcmnet/libsrc/dstorscu.cc
+++ b/dcmnet/libsrc/dstorscu.cc
@@@ -927,10 -927,8 +927,10 @@@ OFCondition DcmStorageSCU::sendSOPInsta
  }
  
  
- void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry &transferEntry)
+ void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry & /*transferEntry*/)
  {
 +    // avoid compiler warning
 +    (void)transferEntry;
      // do nothing in the default implementation
  }